Merge from trunk
authorJan D. <jan.h.d@swipnet.se>
Tue, 23 Mar 2010 19:32:31 +0000 (20:32 +0100)
committerJan D. <jan.h.d@swipnet.se>
Tue, 23 Mar 2010 19:32:31 +0000 (20:32 +0100)
commit906014cd42bf894a8b7702b56c3fae4e0edcbae7
tree8a8fa529613333de6c593fbcb0bffcffced42f09
parente8679556eadfd57024e513d575423f1d60af218c
parentee42057aa3b52bed6b0610fe040d8231b0c4267c
Merge from trunk